design issues fixed Closes #39