Revert "reduced complexity"
Revert "reduced complexity"

This reverts commit 8c8f651f50272f5457f5bde04dc0127379ab886f.

thomas-lange-smf/CRUDlex,philiplb/CRUDlex,thomas-lange-smf/CRUDlex,philiplb/CRUDlex