added code for 10293 10508