Corrected proposal and added make tasks