few little changes
Merge branch 'redesignForReflection' into testing2