changes merged in from test