changed order of methods to match develop. hopefully this will allow
this branch to merge with develop cleaner.