Convert to using make