changed for more new system