some details fixed