Added 4 new options, requires testing