Integrate Badhon's work