WORKING VERSION FOR DEMO --without synonym support