integrating own stuff