took out kludge, did it properly