updated core, now shared with linux