Implemented Rules, requires db update