This should remain compatible, it only adds a return in order to build on the new system.