Entry-exit evaluation

Some updates