split into two code blocks #163