Can we find a way to remove magic numbers here too? Maybe put the constants in a fourup configuration struct