improved temp transfert and resolved minor bug