Updated as of 3/11/13

Edited method names to match changes in the classes so it still compiles