this is last update before start to keep changes and add buttons to Modal