Removed Random from most places