Basic structure reworked.