Applied some changes