trying to optimize performance
trying to optimize performance
updated for latest Dart SDK 0.4.2