+1 I like all changes proposed