restart/AI stuff
fixed merge conflicts