Back to version with swallow - rand function fixed