Added more code for faster load up speed.