reverted some of the changes from earlier