last working version before I try to handle for blank fields