implementing Chris suggestions