Finished changing method signatures