Manuall merged Hector Castro's edits. Updated graphics