add b
add c
add o c
Merge branch 'amanda' into davy