Enhancements

advanced FLOW engineering