making some more changes now