toms customization
merge to tom