Update to include checks for all