Reverted some code