Sdv 213 deputyship changes

:+1: for making this cleaner