removing some change, but keeping the ui fixes