diff --git a/bin/FSHa.8xp b/bin/FSHa.8xp
index 3edf073..8355ea7 100644
Binary files a/bin/FSHa.8xp and b/bin/FSHa.8xp differ
diff --git a/includes/commands/SET.asm b/includes/commands/SET.asm
index 36af490..e724379 100644
--- a/includes/commands/SET.asm
+++ b/includes/commands/SET.asm
@@ -2,6 +2,19 @@ fshcmdSET:  .db "SET", 0
 fshcmdSETo: .db $01
 fshcmdSETu: .db "Sets a value in FSH memory", 0
 fshcmdSETf:
+fshcmdSETfArg0: 
+ ld hl, FshCmdArg0
+ ld de, 0
+ ld e, (hl)
+ inc hl
+ ld d, (hl)
+ ex de, hl
+ ld de, 0
+ call cpHLDE
+ jr nz, fshcmdSETfArg1
+fshcmdSETfArg0Get:
+ ld a, 'G'
+ call _PutC
  xor a
  ld (CurCol), a
  ld hl, fshcmdSETfDIndex
@@ -12,6 +25,18 @@ fshcmdSETf:
  call strtob
  ld de, 0
  ld e, a
+fshcmdSETfArg1:
+ push de
+  ld hl, FshCmdArg1
+  ld e, (hl)
+  inc hl
+  ld d, (hl)
+  ex de, hl
+  ld de, 0
+  call cpHLDE
+ pop de
+ jr nz, fshcmdSETfExe
+fshcmdSETfArg1Get:
  push de
   call _NewLine
   xor a
@@ -23,6 +48,7 @@ fshcmdSETf:
   call inputnumstr
   call strtob
  pop de
+fshcmdSETfExe:
  ld hl, 0
  ld l, a
  call fshvarset
diff --git a/includes/define.inc b/includes/define.inc
index 4274022..6694cf2 100644
--- a/includes/define.inc
+++ b/includes/define.inc
@@ -19,7 +19,7 @@ FshPrgm       equ FshCmd + FshCmdSize
 
 FshCmdNull    equ FshCmd  + FshCmdInptSize
 FshCmdOP      equ FshCmdNull + 1
-FshCmdArg1    equ FshCmdNull + 2
-FshCmdArg2    equ FshCmdNull + 4
-FshCmdArg3    equ FshCmdNull + 6
-FshCmdArg4    equ FshCmdNull + 8
+FshCmdArg0    equ FshCmdOP + 1
+FshCmdArg1    equ FshCmdOP + 3
+FshCmdArg2    equ FshCmdOP + 5
+FshCmdArg3    equ FshCmdOP + 7