Added not-so-well-working smooth animation that is turned off for now