somewhat more working now