Add randomness in moves + cleaning