More tuning to manage-form