Core pr 4

Merge with PH libraries.