Adding metrics and notes from bwalker