fix individual impl and make proper use of mods