XML comments + logic change, new methods + constr