added mac version, restructured