First commit for condition logic