Removed tapir, added notes
Merged old and new