integrate badhon's work