implementing mdowd suggestions