Cleaned up STS