Improved the extending system.