* Updated couple of features