some fitting issues remain