added Pascal's suggestions