Switched the database to using users verses direct tabe()