Modified "getCurrentState"