mostly OK now