Working version with random bump following