added concept of name and updated all logging