singleton changes and proxy changes