fixed propogation stuff