Change didInit event to just init