Fixed a bit, now using old system again (new is still there)