some changes that made this thing stop working ...