tidied up options