reverting some small changes