changed return data to be valid