Redo init handlers
Comments