Merged changes into ARC_setup_lv