integrate extra stuff in main source