Updated master flow