shock proxy changes included