Improved DemoCat to work form x20.