Clearer modulation
Some serious refactor shit