#16 Added transition controller