Adding Todds enhancements