moved some old and crappy code