Better Logic

Better Logic