added smoooth transitions