update to my latest standard conventions