update with the latest patches

update with the latest patches