Removed _noon up_ stuff from MLT part because it didn't work.
Cleaned up merge conflict.