Revert "Add transition parameter and etc...?"