Added some return values.