added stay_self