This code still sucks