still not working more changes