update as suggested by Michael