merged changes
merged schema
fixed complications and hip approach