Updated PR to tilius comments