16 feb perf chap further polish, to the application part