Updates and some changes