Changed signatures for two helper methods