Identifying code areas for #164