Added all latest changes