Upadted logging