Made minor improvements to T7