now even more working