some changes & updates