updates for latest php
merge