add new code for support keep live in correct way