cross improved, swipes added