Combined changes from Katie and Justin's work