migrate to better way