Made a few changes, still not working