(Mod) Getting rid of overloading