added attractor class and many things