Version 1.6. - Extra logging