Further &amp; fixing