Changed signature to read better