Significantly cleaned up the joint architecture.