Update update_Self to new function