Per person update

Still buggy