Build 1.2.8 - Adding more comments