Dev - merged with 2.01 beta merge for new API change