Final version

All expressions added