Session Bug fixed. Clean code V1