applied first part of Pascal's suggestions