Renamed methods so they are clearer