fixing elb, adding some raiden ish