Added some return values