moved around code, added new methods (have not tested though)