Added in some magnitude, needs cleaning