updates to input data and Matz's code for test as single model