refactor & add new logs