More work on asm side