slightly better, but not entirely working...