Added T stop stuff