Several changes to toymodel