Added ability to query for current state at any time