integrating some older work