removed transition stuff