split base and core complet ?
cleand up a bit