Incorporate Hickey's talk (0.1)