Commented to compile re-engineered version