System options working now