With wireframe changes