final commit before the remake