RandomHandler improved