Now uses methods to get the faces and vertices