work towards mac support