eliben Apply part 2 changes