partial merge with old UI
partial integration with an old ui