added support for transitions