more minor modifications
more minor modifications