Updated per Harsha's changes