adapting model
fixes to make reports work