this seems to be working now...