Vijay's patch v3