finished second version - sending to josh