minor changes
test in progress