Better but still not working