propagate changes to the rest of the code