change return types
REF T296