Added more support for turn