Changed outline, removed unused parts, via stops