Eluna do changes to make things similar to TC code