and/or to &&/||, will be merged with last commit