Updated version, still not working