Now takes only 1 sec to render page instead of 3.5 before