More attempts to make circles/swipes more reliable