changed to new system