Update, refactor