small changes to return types