Init
Rebasing and update