Demo improved. Callbacks fixed for the "simple" transition. Code refactor & cleanup.