changes suggested by borntyping