Key action fixed, refactor steps