added extra features!