start to edit keepalive, some changes.