updated with Sunday's work (initial copy)