added from kmy0ra2