More work on the less setup.