Removed Max' shitty code