some renaming; fixed forwarding to ptango