slightly better, if still questionable, organization