Tidied up options logic and added BC message