Updated to latest core