changes suggested by adamv