More work on slick branch