Feature -- Extra logging
Feature -- Improving speed