Commit Vikram's changes for 426 class