Reduced loading time to about 7 seconds from 30 seconds