changed some return values