gets the new method signatures correctly, lots of clean-up todo