2-way communication improved and removed test code.