refactor currentPhase outside of State class
merge currentPhase change with new JSONObject change