Changed make and now using autopairs for $