Added UI flows from @neocatalyst