Added better restructuring.