Merged Ethan's changes successfully