368.11 Adding assertions and magic numbers