Assembly is better now