Some more changes, but still not working