Self intersection now works better