Cleaned up and added to Conversions diagram