reverted some of the changes