Reverted bad changes