Address trustins comments