reconfigured,removed include, added autostart