Reverted some of the changes