following changes not included in the last commit