mac functionality added