changed stuff, needs more change