Update to improve loading