start changes to allow platform choice