reverting a few things