now with more features