Some changes

Not working yet, commit to save changes.