Updated to be less suck