changes made per Gabriel