Updated Changes accordingly for #1 [ci skip]