merged in Sachin's updates