Update to latest working version

This does not include the change on pay pal