Some thoughts, changes