added option to disable transitions