Tidyings and more sophisticated version of WITHOUT