Return type here also out of date?