enhanced properties
Revert "enhanced properties"

This reverts commit d1a3fbdb14bca228289a5779df98099a1df43fd7.