further reorganization of the legacy method