Updated initialization !