improve assembly