Core update (good design is as little as possible)