update for some more features