will add a comment + plus remove the #if 0 blocks from down below.