Mac Architechure added, need refinement