Some details fixed