Suggested changes from EO and add Monitor