updates to #2778