Modifying based on feedback from Russell.