Core update (time for refactoring)