Upgraded to latest danack code.