Make updates. Add transition option