Redid system a bit