Revert "Revert "Adds more clever content""

This reverts commit 41e7db9739e37f8d05dfa0c489f701983fe24a5c.