Renamed some variables, changed some timings