more work done on UI