Some more work on the assembly