Haha ;-) I tried to refactor @adykstra 's contribution such that we don't get flooded by fiff constants + this part of the code remains as readable as possible