[TASK] Check secondary options - #43