Modifications to td9