Added Updates from Herbert