Updated for load time efficiency