Integrating Samuel's enhancements into the main repo