Pettine with Hoyer and Shaw updates

Pettine with Hoyer and Shaw updates