Added dad stuff and xp2xm