Took out hacky solution