wip
fix range