make edits from javier and dustin