Change API as suggested by FWeinb