Implemented faster loading