Added back some things that were dropped.