reverted two wrong changes