ASM update, lots of work I know :P