Adding 5-13 tail impl