Some changes, finished