Main class. Updated to 1.6.4