Made random things more functional