#4 fix returns format