First version of new system