From ST2 again. Cleaned up.