Reverting to some changes from last commit