core update

merging from fluoro