presentation fix
Merge branch 'presentationfix' into test2