minor changes
still not working