made changes to remove my_