NXBOOK-736 implemented feedback from @kellyrob99