re-introducing Dayals changes after the bad merge incident