Further changes to complete LF8 task.