further changes made based on new comments