refactor contune...