TPoX improvements