Added some more reset stuff due to conflicts