chagnes as per pull request comments