Untested in plotting
Working faster
Working version with just Magnitudes!