updates to bring in changes from yesterday