[REFACTOR] Working on final refination