Friction stuff added