Update with Cory's additions