Modified system for better matching