moved delivery inside of handshake