Implemented @jlee-r7 requested changes