Made some minor modifications