a new branch
ANDsimple
& simple
conflict fixed