Core update 2.0

Hi Salieri,

Have you seen this post, it might be applicable.