Add Auto Return to splice table
Refactor: remove code not required for splice table