Integrating with andrew's version
Integrating with andrew's version