updated for current version of dart