Changes after reviewcode to request #82