Modifications of query.py and introduction of a better decay dummies