Feature/shorten ack path