Merged in Vikram's changes