new round of modification, better transition, more gifs