Some changes when finishing