updated with our database