Included @jvazquez-r7 feedback