changed some stuff, still needs work