modified uts to take into account the new entry points