Cleaned up, 100% matching