Updates, still not working as it should...