PB: STORM - revised query