Well the refactoring seems to work  after some uigen changes - more
testing needed