diff --git a/Debug/ps7/base_zynq_wrapper.bit b/Debug/ps7/base_zynq_wrapper.bit
index 2913609..cc128b2 100644
Binary files a/Debug/ps7/base_zynq_wrapper.bit and b/Debug/ps7/base_zynq_wrapper.bit differ
diff --git a/Debug/ps7/ps7_init.tcl b/Debug/ps7/ps7_init.tcl
index 2856c42..643c2f0 100644
--- a/Debug/ps7/ps7_init.tcl
+++ b/Debug/ps7/ps7_init.tcl
@@ -33,26 +33,27 @@ proc ps7_clock_init_data_3_0 {} {
     mask_write 0XF800014C 0x00003F31 0x00000501
     mask_write 0XF8000150 0x00003F33 0x00001401
     mask_write 0XF8000154 0x00003F33 0x00001402
+    mask_write 0XF8000164 0x00003F73 0x00000143
     mask_write 0XF8000168 0x00003F31 0x00000501
-    mask_write 0XF8000170 0x03F03F30 0x00400500
+    mask_write 0XF8000170 0x03F03F30 0x00100720
     mask_write 0XF80001C4 0x00000001 0x00000001
     mask_write 0XF800012C 0x01FFCCCD 0x01EC044D
     mwr -force 0XF8000004 0x0000767B
 }
 proc ps7_ddr_init_data_3_0 {} {
     mask_write 0XF8006000 0x0001FFFF 0x00000080
-    mask_write 0XF8006004 0x0007FFFF 0x00001081
+    mask_write 0XF8006004 0x0007FFFF 0x00001082
     mask_write 0XF8006008 0x03FFFFFF 0x03C0780F
     mask_write 0XF800600C 0x03FFFFFF 0x02001001
     mask_write 0XF8006010 0x03FFFFFF 0x00014001
     mask_write 0XF8006014 0x001FFFFF 0x0004159B
-    mask_write 0XF8006018 0xF7FFFFFF 0x452440D2
-    mask_write 0XF800601C 0xFFFFFFFF 0x720238E5
-    mask_write 0XF8006020 0x7FDFFFFC 0x27087290
+    mask_write 0XF8006018 0xF7FFFFFF 0x452444D3
+    mask_write 0XF800601C 0xFFFFFFFF 0x7282BCE5
+    mask_write 0XF8006020 0x7FDFFFFC 0x270872B0
     mask_write 0XF8006024 0x0FFFFFC3 0x00000000
     mask_write 0XF8006028 0x00003FFF 0x00002007
     mask_write 0XF800602C 0xFFFFFFFF 0x00000008
-    mask_write 0XF8006030 0xFFFFFFFF 0x00040930
+    mask_write 0XF8006030 0xFFFFFFFF 0x00040B30
     mask_write 0XF8006034 0x13FF3FFF 0x000116D4
     mask_write 0XF8006038 0x00000003 0x00000000
     mask_write 0XF800603C 0x000FFFFF 0x00000777
@@ -223,7 +224,6 @@ proc ps7_peripherals_init_data_3_0 {} {
     mask_write 0XE000A008 0xFFFFFFFF 0x7FFF0000
     mask_delay 0XF8F00200 1
     mask_write 0XE000A008 0xFFFFFFFF 0x7FFF8000
-    mask_delay 0XF8F00200 1
     mask_write 0XE000A244 0x003FFFFF 0x0000C000
     mask_write 0XE000A008 0xFFFFFFFF 0xBFFF4000
     mask_write 0XE000A248 0x003FFFFF 0x0000C000
@@ -234,6 +234,9 @@ proc ps7_peripherals_init_data_3_0 {} {
 proc ps7_post_config_3_0 {} {
     mwr -force 0XF8000008 0x0000DF0D
     mask_write 0XF8000900 0x0000000F 0x0000000F
+    mwr -force 0XF8803FB0 0xC5ACCE55
+    mask_write 0XF8803004 0xFFFFFFFF 0x80000000
+    mwr -force 0XF8803FB0 0x00000000
     mask_write 0XF8000240 0xFFFFFFFF 0x00000000
     mwr -force 0XF8000004 0x0000767B
 }
@@ -277,26 +280,27 @@ proc ps7_clock_init_data_2_0 {} {
     mask_write 0XF800014C 0x00003F31 0x00000501
     mask_write 0XF8000150 0x00003F33 0x00001401
     mask_write 0XF8000154 0x00003F33 0x00001402
+    mask_write 0XF8000164 0x00003F73 0x00000143
     mask_write 0XF8000168 0x00003F31 0x00000501
-    mask_write 0XF8000170 0x03F03F30 0x00400500
+    mask_write 0XF8000170 0x03F03F30 0x00100720
     mask_write 0XF80001C4 0x00000001 0x00000001
     mask_write 0XF800012C 0x01FFCCCD 0x01EC044D
     mwr -force 0XF8000004 0x0000767B
 }
 proc ps7_ddr_init_data_2_0 {} {
     mask_write 0XF8006000 0x0001FFFF 0x00000080
-    mask_write 0XF8006004 0x1FFFFFFF 0x00081081
+    mask_write 0XF8006004 0x1FFFFFFF 0x00081082
     mask_write 0XF8006008 0x03FFFFFF 0x03C0780F
     mask_write 0XF800600C 0x03FFFFFF 0x02001001
     mask_write 0XF8006010 0x03FFFFFF 0x00014001
     mask_write 0XF8006014 0x001FFFFF 0x0004159B
-    mask_write 0XF8006018 0xF7FFFFFF 0x452440D2
-    mask_write 0XF800601C 0xFFFFFFFF 0x720238E5
-    mask_write 0XF8006020 0xFFFFFFFC 0x27287290
+    mask_write 0XF8006018 0xF7FFFFFF 0x452444D3
+    mask_write 0XF800601C 0xFFFFFFFF 0x7282BCE5
+    mask_write 0XF8006020 0xFFFFFFFC 0x272872B0
     mask_write 0XF8006024 0x0FFFFFFF 0x0000003C
     mask_write 0XF8006028 0x00003FFF 0x00002007
     mask_write 0XF800602C 0xFFFFFFFF 0x00000008
-    mask_write 0XF8006030 0xFFFFFFFF 0x00040930
+    mask_write 0XF8006030 0xFFFFFFFF 0x00040B30
     mask_write 0XF8006034 0x13FF3FFF 0x000116D4
     mask_write 0XF8006038 0x00001FC3 0x00000000
     mask_write 0XF800603C 0x000FFFFF 0x00000777
@@ -468,7 +472,6 @@ proc ps7_peripherals_init_data_2_0 {} {
     mask_write 0XE000A008 0xFFFFFFFF 0x7FFF0000
     mask_delay 0XF8F00200 1
     mask_write 0XE000A008 0xFFFFFFFF 0x7FFF8000
-    mask_delay 0XF8F00200 1
     mask_write 0XE000A244 0x003FFFFF 0x0000C000
     mask_write 0XE000A008 0xFFFFFFFF 0xBFFF4000
     mask_write 0XE000A248 0x003FFFFF 0x0000C000
@@ -479,6 +482,9 @@ proc ps7_peripherals_init_data_2_0 {} {
 proc ps7_post_config_2_0 {} {
     mwr -force 0XF8000008 0x0000DF0D
     mask_write 0XF8000900 0x0000000F 0x0000000F
+    mwr -force 0XF8803FB0 0xC5ACCE55
+    mask_write 0XF8803004 0xFFFFFFFF 0x80000000
+    mwr -force 0XF8803FB0 0x00000000
     mask_write 0XF8000240 0xFFFFFFFF 0x00000000
     mwr -force 0XF8000004 0x0000767B
 }
@@ -522,26 +528,27 @@ proc ps7_clock_init_data_1_0 {} {
     mask_write 0XF800014C 0x00003F31 0x00000501
     mask_write 0XF8000150 0x00003F33 0x00001401
     mask_write 0XF8000154 0x00003F33 0x00001402
+    mask_write 0XF8000164 0x00003F73 0x00000143
     mask_write 0XF8000168 0x00003F31 0x00000501
-    mask_write 0XF8000170 0x03F03F30 0x00400500
+    mask_write 0XF8000170 0x03F03F30 0x00100720
     mask_write 0XF80001C4 0x00000001 0x00000001
     mask_write 0XF800012C 0x01FFCCCD 0x01EC044D
     mwr -force 0XF8000004 0x0000767B
 }
 proc ps7_ddr_init_data_1_0 {} {
     mask_write 0XF8006000 0x0001FFFF 0x00000080
-    mask_write 0XF8006004 0x1FFFFFFF 0x00081081
+    mask_write 0XF8006004 0x1FFFFFFF 0x00081082
     mask_write 0XF8006008 0x03FFFFFF 0x03C0780F
     mask_write 0XF800600C 0x03FFFFFF 0x02001001
     mask_write 0XF8006010 0x03FFFFFF 0x00014001
     mask_write 0XF8006014 0x001FFFFF 0x0004159B
-    mask_write 0XF8006018 0xF7FFFFFF 0x452440D2
-    mask_write 0XF800601C 0xFFFFFFFF 0x720238E5
-    mask_write 0XF8006020 0xFFFFFFFC 0x27287290
+    mask_write 0XF8006018 0xF7FFFFFF 0x452444D3
+    mask_write 0XF800601C 0xFFFFFFFF 0x7282BCE5
+    mask_write 0XF8006020 0xFFFFFFFC 0x272872B0
     mask_write 0XF8006024 0x0FFFFFFF 0x0000003C
     mask_write 0XF8006028 0x00003FFF 0x00002007
     mask_write 0XF800602C 0xFFFFFFFF 0x00000008
-    mask_write 0XF8006030 0xFFFFFFFF 0x00040930
+    mask_write 0XF8006030 0xFFFFFFFF 0x00040B30
     mask_write 0XF8006034 0x13FF3FFF 0x000116D4
     mask_write 0XF8006038 0x00001FC3 0x00000000
     mask_write 0XF800603C 0x000FFFFF 0x00000777
@@ -711,7 +718,6 @@ proc ps7_peripherals_init_data_1_0 {} {
     mask_write 0XE000A008 0xFFFFFFFF 0x7FFF0000
     mask_delay 0XF8F00200 1
     mask_write 0XE000A008 0xFFFFFFFF 0x7FFF8000
-    mask_delay 0XF8F00200 1
     mask_write 0XE000A244 0x003FFFFF 0x0000C000
     mask_write 0XE000A008 0xFFFFFFFF 0xBFFF4000
     mask_write 0XE000A248 0x003FFFFF 0x0000C000
@@ -722,6 +728,9 @@ proc ps7_peripherals_init_data_1_0 {} {
 proc ps7_post_config_1_0 {} {
     mwr -force 0XF8000008 0x0000DF0D
     mask_write 0XF8000900 0x0000000F 0x0000000F
+    mwr -force 0XF8803FB0 0xC5ACCE55
+    mask_write 0XF8803004 0xFFFFFFFF 0x80000000
+    mwr -force 0XF8803FB0 0x00000000
     mask_write 0XF8000240 0xFFFFFFFF 0x00000000
     mwr -force 0XF8000004 0x0000767B
 }
diff --git a/Debug/ps7/start_amp_session.sh b/Debug/ps7/start_amp_session.sh
index 7ca233c..80ac39a 100755
--- a/Debug/ps7/start_amp_session.sh
+++ b/Debug/ps7/start_amp_session.sh
@@ -19,10 +19,8 @@
 # ppwd will be the absolute path to the current bash script
 export ppwd=$( cd $(dirname "$0") && pwd)
 
-USER_ID=`id -u`
-USER_ID_SUFFIX=${USER_ID:(-4)} 
 
-P1_PORT=$((10000+$USER_ID_SUFFIX))
+P1_PORT=$((10000+$RANDOM))
 P2_TITLE=ARM_AMP_CORE0
 P3_TMP=/tmp
 P4_SYS=/tools/lauterbach/r_2018_02