reshma - adding changes to v2 from v3