Cleaned up Phevor.