Implementation details pt 2