changes to help matching with DB