Added propper front - reducing load time