Andrew fixing andrews shitty code