Update code for multi platform purposes