changed query for severer