Little changes, still not working