Added back in more features