Added code to make current status clearer.