Add ack/nack control
Fix ack