reorganized and working
minor change
no longer using