Revert "corrected constructor + select values"

This reverts commit 849be2f1ca4e5ee2fd7e9fb3261521f784a8f6d9.