updated to use latest UI