Changed it to the general form