Updated to make more simple and less load time