added loading status and removal