Consolidate with mac project.