focus on UW
cleaned code