urgh. reverting a bit