Fixed Aaron's shitty code