Made keywords match the logic