Corrected not using compiler macro
added chatclient lines