Added loading and more