Changed the Custom unit system. Implementation is much easier now