Added more formats to help
merge conflict fixed