some changes
annotated model