more changes to things less obvious