minor modifications according to feedback