Now System.add works much much better