New design + comment fixes added