Revert "Revert "adjusting some of the properties""

This reverts commit 00fcea1e06db8f235a1b91a2252c9d097b732714.