functional changes in all code