Make generic for all my systems