fixing *wtay*'s code