added better autorun setup