modifications following customer tests and comments