Changed to more features