Gasp An Assembly Optimization and Fix

23