Refine exiting to work in tigher spaces