updates to #16