Incorporating recent additions.