removed TODO #35
simplified asm code