specific code added by tom