Updated Make 12/8/14