Added safety and messages to loading