#18 added some friction bits