final commit before live: rest