Shrinking the main commander file a bit