added wait for it mechanism in after init event