Working on assembly
Build fix