Better naming
Propagation working now