Removed hacks, but it still doesnt end at the correct time