added artifact and comments
merge