Radiation trapping added.
Merging.