Some changes for smoothness