few changes, working on coombs computer