Switched it back to the original code, so I add my attachment changes and submit back to original fork.