added stuff for conditional get