working on Windows/Mac build compatibility