update before steven
combine