More changes...still not working