* merger code
new UI