More work on new system