using new assets + controls tweak