Core code updated