New code after some forgotten return types