Fix Tyler's shitty code + add mine