tweaks from test 3