performance improvements for implicit flows