reverting some of the changes in the last commit