Bring back to unrefactored code, plus charactarization file