changes as suggested by jon