refactor of radar