Asm 2602 and refactor