Updating core functions