In the middle of applying Rick's comments