revision and extension of 04-24