interim changes to get monitoring working