Add random in behavior
Add TODO