Fixed Structural Issues