fix???
keep simple till build is right