More some improvements added.