Addd some changes