Should work with X's functions now