Worked a little bit on making sure the database isn't accessed as much to save time.