mostly added db queries