New improved way of handling focus-on-part.