Revert "Revert "cricketism - db changes""

This reverts commit b2da3a36d70d6ce489a35ac0f2eb0a80da0abda2.