Improve look&fill