refactor finally cought up to before\!