closed issue_023_icarus and issue_028_icarus, opened issue_029