updated code to reflect and give errors on recent api limitation changes