minor update (names + return types)