Working version with point removal.