current system
removed autoload
solved conflicts