modified wireframe again