more work on discipline form