Both providers now working
Added more options