Updating XTK changes