changes as per discussion with Liz, Pete and Lothar