Some changes, not finished