fixed ex dimension
TODO comment
changed ids
Merge branch 'master' into beta