rename, speed some bits up