Finish Mac implementation