Update conditional checks
Update conditional checks