minor modifications to comply the reqs