improve cross platform branch
WIP