improvements to work in more than one app