make options more flexible