added minor modifications