Feature/ack on entry