Tried to add E logic..