Fixed passing multiple methods

Also avoided repeating the same methods.