Completed work on punishment system complex commands