Block and ArmSwing changes