TME-24 changes added