Shock proxy changes included