removed logic from UI