davidedelpapa added better init flow