Temporarily removed add2home, stay_standalone