merged Daniel and Katherine's writeup