added extra little features