Use plug and just simplify everything