Base : peek update and fixes