Update based on @toch's feedback