rewrites application for dart 1.5.1