diff --git a/Starfinder Official/Starfinder.html b/Starfinder Official/Starfinder.html
index 38d7b19194..5e7920166c 100644
--- a/Starfinder Official/Starfinder.html	
+++ b/Starfinder Official/Starfinder.html	
@@ -4601,19 +4601,8 @@ This pattern can be found at https://regexr.com/3mi9v
                                 <span class='label' data-i18n='special'>SPECIAL</span>
                                 <input class='atk-special medium-input input-field' type='text' title='@{special}' name='attr_special' placeholder='heirloom' value=''>
                             </div>
-                            <input class='field-tab' type='checkbox' title='@{full_attack_checkbox}' name='attr_full_attack_checkbox' value='1' hidden='true'>
-                            <label class='expandable'><input class='field-tab macro-tab' type='checkbox' title='@{full_attack_checkbox}' name='attr_full_attack_checkbox' value='1' hidden='true'><span class='label field' data-i18n='additional-attack'>ADDITIONAL ATTACKS</span></label>
-                            <input class='field-tab' type='checkbox' title='@{full_attack_checkbox}' name='attr_full_attack_checkbox' value='1' hidden='true'>
-                            <div class='field-container group expandable'>
-                                <span class='label' data-i18n='roll-full-attack_'>ROLL FULL ATTACK: </span>
-                                <label><input type='radio' title='@{full_attack_query}' name='attr_full_attack_query' value='?{Full Attack|No,0|Yes,1}' checked='checked'><span class='label'  data-i18n='query'>QUERY</span></label>
-                                <label><input type='radio' title='@{full_attack_query}' name='attr_full_attack_query' value='1'><span class='label' data-i18n='always'>ALWAYS</span></label>
-                                <label><input type='radio' title='@{full_attack_query}' name='attr_full_attack_query' value='0'><span class='label'  data-i18n='never'>NEVER</span></label>
-                                <span class='label' data-i18n='number-of-attacks:'>NUMBER OF ATTACKS:</span>
-                                <input class='small-input attack-num input-field' type='text' title='@{full_attack_number}' name='attr_full_attack_number' value='2'>
-                                <span class='label' data-i8n='full-attack-penalty:'>ATTACK PENALTY:</span>
-                                <input class='small-input attack-num input-field' type='text' title='@{full_attack_penalty}' name='attr_full_attack_penalty' value='-4'>
-                            </div>
+                            <span class='label' data-i18n='number-of-attacks:'>NUMBER OF ATTACKS:</span>
+                            <input class='bab-input attack-num input-field' type='text' title='@{full_attack_number}' name='attr_full_attack_number' value='2'>
                             <input class='field-tab macro-tab' type='checkbox' title='@{macro_checkbox}' name='attr_macro_checkbox' value='1' hidden='true'>
                             <label class='expandable'><input class='field-tab macro-tab' type='checkbox' title='@{macro_checkbox}' name='attr_macro_checkbox' value='1' hidden='true'><span class='label field' data-i18n='attacher'>ATTACHER</span></label>
                             <input class='field-tab macro-tab' type='checkbox' title='@{macro_checkbox}' name='attr_macro_checkbox' value='1' hidden='true'>