Changed return data to fit the need