integrating some stuff