more work on ui integration