Merged with Laura's changes and enabled monitoring.