Renamed some things to make it clearer