Added Ethan's stuff, but still problems