before ui fixes