Adding the single-end mode