some changes, will take over on rig