handle wall on the side, re-add keepalive