large backend efficiency change to not hit the database so much