reworked keep-alive