changes made as asked