Updated per latest version of saddle