new branch for logging feature
logging done