Rebase using package from Khiem