made changes suggested by Jason