updated project to work with macaraon