Porting 596 Heads

Ok, I think I get it now. Thanks.