Minor changes, still not working