Did not agree with all changes. Reverted them..