Adding the latest raft of changes