#158 IP-01 adds comments and OTHER