added frandom support