Refactored old classic 1.0B1 -> 1.2