Changed code to use faces