added the two suggestions made by Elliott