updated to fix minor edit collision...