Adapted PR according to comments