a lot of additions and updates