Modified comments after additional testing