added animation (still need waittitng stuff)