Improve assembly (WIP)