diff --git a/psx/octoshock/docs/upstreaminfo.txt b/psx/octoshock/docs/upstreaminfo.txt
index 9b2362b5a6..ee47714b10 100644
--- a/psx/octoshock/docs/upstreaminfo.txt
+++ b/psx/octoshock/docs/upstreaminfo.txt
@@ -131,4 +131,8 @@
 [NO] psx/psx : render parameters stuff
 [OK] tests : pasted over and whittled down
 0.9.41 -> 0.9.42
-[OK] tests : some 64bit casting tests
\ No newline at end of file
+[OK] tests : some 64bit casting tests
+0.9.42 -> 0.9.43
+[OK] psx/frontio : (c), UpdateOutput() [not needed]
+[OK] psx/input/dualshock : (c), analog state change [TEST]
+[ok] psx/psx : (c), UpdateOutput() [not needed]
\ No newline at end of file
diff --git a/psx/octoshock/psx/frontio.cpp b/psx/octoshock/psx/frontio.cpp
index f602d8929e..4557a035ed 100644
--- a/psx/octoshock/psx/frontio.cpp
+++ b/psx/octoshock/psx/frontio.cpp
@@ -2,7 +2,7 @@
 /* Mednafen Sony PS1 Emulation Module                                         */
 /******************************************************************************/
 /* frontio.cpp:
-**  Copyright (C) 2011-2016 Mednafen Team
+**  Copyright (C) 2011-2017 Mednafen Team
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public License
diff --git a/psx/octoshock/psx/frontio.h b/psx/octoshock/psx/frontio.h
index 0762bf644e..25dee17968 100644
--- a/psx/octoshock/psx/frontio.h
+++ b/psx/octoshock/psx/frontio.h
@@ -2,7 +2,7 @@
 /* Mednafen Sony PS1 Emulation Module                                         */
 /******************************************************************************/
 /* frontio.h:
-**  Copyright (C) 2011-2016 Mednafen Team
+**  Copyright (C) 2011-2017 Mednafen Team
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public License
diff --git a/psx/octoshock/psx/input/dualshock.cpp b/psx/octoshock/psx/input/dualshock.cpp
index 3dbbefe5d2..400c69d4f4 100644
--- a/psx/octoshock/psx/input/dualshock.cpp
+++ b/psx/octoshock/psx/input/dualshock.cpp
@@ -2,7 +2,7 @@
 /* Mednafen Sony PS1 Emulation Module                                         */
 /******************************************************************************/
 /* dualshock.cpp:
-**  Copyright (C) 2012-2016 Mednafen Team
+**  Copyright (C) 2012-2017 Mednafen Team
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public License
@@ -318,18 +318,11 @@ void InputDevice_DualShock::UpdateInput(const void *data)
   if(((rumble_param[0] & 0xC0) == 0x40) && ((rumble_param[1] & 0x01) == 0x01))
    sneaky_weaky = 0xFF;
 
-  MDFN_en16lsb<false>(rumb_dp, sneaky_weaky << 0);
- }
-
- //printf("%d %d %d %d\n", axes[0][0], axes[0][1], axes[1][0], axes[1][1]);
-
- //
- //
- //
- CheckManualAnaModeChange();
-
+	MDFN_en16lsb(rumb_dp, sneaky_weaky << 0);
+ }
+
  //
- // Encode analog mode state last.
+ // Encode analog mode state.
  //
  d8[2] &= ~0x6;
  d8[2] |= (analog_mode ? 0x02 : 0x00);
diff --git a/psx/octoshock/psx/psx.cpp b/psx/octoshock/psx/psx.cpp
index bab519d61b..8f36d50828 100644
--- a/psx/octoshock/psx/psx.cpp
+++ b/psx/octoshock/psx/psx.cpp
@@ -2,7 +2,7 @@
 /* Mednafen Sony PS1 Emulation Module                                         */
 /******************************************************************************/
 /* psx.cpp:
-**  Copyright (C) 2011-2016 Mednafen Team
+**  Copyright (C) 2011-2017 Mednafen Team
 **
 ** This program is free software; you can redistribute it and/or
 ** modify it under the terms of the GNU General Public License