updating parsing for the || and &&