New optimized version containing latest changs.