First steps to fix issue #129
Closes #130
Performance revisions