Fixed AC to send message every second
Resolved merge confilict