Updated according to new wireframe