corrected as per PR comments
merge remote changes