Some changes to free