reverting some mistakes