minor changes still learning how this is going to work