Integration with aneesh and george's code-v1.0