Fixed and improved attract/repel