code to simply test/debug
fixed TRIS bug
resolved merge conlfict