Modifications to have better main client