abstract example fixes
merged conflicts