update for enhancements #927 #928