Update to swap live with on and also fix the noce issue