Updated with physics/statmech module