worked a bit more one the new system