commit before migrate to new UI