Patch 2_UpdateRate_Fix

This will be merged with further UpdateRate_Fixes