updated for dougs comments