added transitions
merge with 73f0cff1228a1d83ec948648d7efd0d2b8adfdb3