2_Maxwell_Improvements