Better animation - still work in progress  !!!