not working right
small changes