more flxible with third party integration
fix conflicts in merging