Build 1.2.8 - More comments