Revised the database structure so it's way betta