taking changes suggested in #4