Pls do some changes