removed some return data