added stuff like loading and stuff