Reworked return path, some debugging.