Rolled back some of the changes trying to improve performance using the db