Feature/575 freq part2