Squisher improve

Change-Id: I5b44acb9125012b0fd03725b9ba6c59def2b15c3